Inspector: Show some X display characteristics

This helps diagnose e.g. csd problems.

diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c
index 75365c313eeb4b69b1b519f0064a2cff1f19dea1..0bebf369ede6a29a2d35e2d437578dae64ca4654 100644 (file)
--- a/gtk/inspector/general.c
+++ b/gtk/inspector/general.c
@@ -57,6 +57,7 @@ struct _GtkInspectorGeneralPrivate
 {
   GtkWidget *version_box;
   GtkWidget *env_box;
+  GtkWidget *x_box;
   GtkWidget *gl_box;
   GtkWidget *gtk_version;
   GtkWidget *gdk_backend;
@@ -69,6 +70,9 @@ struct _GtkInspectorGeneralPrivate
   GtkWidget *gtk_exe_prefix;
   GtkWidget *gtk_data_prefix;
   GtkWidget *gsettings_schema_dir;
+  GtkWidget *x_display;
+  GtkWidget *x_rgba;
+  GtkWidget *x_composited;
   GtkSizeGroup *labels;
   GtkAdjustment *focus_adjustment;
 };
@@ -268,14 +272,33 @@ init_env (GtkInspectorGeneral *gen)
   set_path_label (gen->priv->gsettings_schema_dir, "GSETTINGS_SCHEMA_DIR");
 }
 
+static void
+init_x (GtkInspectorGeneral *gen)
+{
+  GdkScreen *screen;
+  gchar *name;
+
+  screen = gdk_screen_get_default ();
+  name = gdk_screen_make_display_name (screen);
+  gtk_label_set_label (GTK_LABEL (gen->priv->x_display), name);
+  g_free (name);
+
+  if (gdk_screen_get_rgba_visual (screen) != NULL)
+    gtk_widget_show (gen->priv->x_rgba);
+
+  if (gdk_screen_is_composited (screen))
+    gtk_widget_show (gen->priv->x_composited);
+}
+
 static void
 gtk_inspector_general_init (GtkInspectorGeneral *gen)
 {
   gen->priv = gtk_inspector_general_get_instance_private (gen);
   gtk_widget_init_template (GTK_WIDGET (gen));
   init_version (gen);
-  init_gl (gen);
   init_env (gen);
+  init_x (gen);
+  init_gl (gen);
 }
 
 static gboolean
@@ -284,18 +307,18 @@ keynav_failed (GtkWidget *widget, GtkDirectionType direction, GtkInspectorGenera
   GtkWidget *next;
   gdouble value, lower, upper, page;
 
-  if (direction == GTK_DIR_DOWN &&
-      widget == gen->priv->version_box)
+  if (direction == GTK_DIR_DOWN && widget == gen->priv->version_box)
     next = gen->priv->env_box;
-  else if (direction == GTK_DIR_DOWN &&
-      widget == gen->priv->env_box)
+  else if (direction == GTK_DIR_DOWN && widget == gen->priv->env_box)
+    next = gen->priv->x_box;
+  else if (direction == GTK_DIR_DOWN && widget == gen->priv->x_box)
     next = gen->priv->gl_box;
-  else if (direction == GTK_DIR_UP &&
-           widget == gen->priv->env_box)
-    next = gen->priv->version_box;
-  else if (direction == GTK_DIR_UP &&
-           widget == gen->priv->gl_box)
+  else if (direction == GTK_DIR_UP && widget == gen->priv->gl_box)
+    next = gen->priv->x_box;
+  else if (direction == GTK_DIR_UP && widget == gen->priv->x_box)
     next = gen->priv->env_box;
+  else if (direction == GTK_DIR_UP && widget == gen->priv->env_box)
+    next = gen->priv->version_box;
   else
     next = NULL;
 
@@ -337,6 +360,7 @@ gtk_inspector_general_constructed (GObject *object)
 
    g_signal_connect (gen->priv->version_box, "keynav-failed", G_CALLBACK (keynav_failed), gen);
    g_signal_connect (gen->priv->env_box, "keynav-failed", G_CALLBACK (keynav_failed), gen);
+   g_signal_connect (gen->priv->x_box, "keynav-failed", G_CALLBACK (keynav_failed), gen);
    g_signal_connect (gen->priv->gl_box, "keynav-failed", G_CALLBACK (keynav_failed), gen);
 }
 
@@ -351,6 +375,7 @@ gtk_inspector_general_class_init (GtkInspectorGeneralClass *klass)
   gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/inspector/general.ui");
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorGeneral, version_box);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorGeneral, env_box);
+  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorGeneral, x_box);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorGeneral, gl_box);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorGeneral, gtk_version);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorGeneral, gdk_backend);
@@ -364,6 +389,9 @@ gtk_inspector_general_class_init (GtkInspectorGeneralClass *klass)
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorGeneral, gtk_data_prefix);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorGeneral, gsettings_schema_dir);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorGeneral, labels);
+  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorGeneral, x_display);
+  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorGeneral, x_composited);
+  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorGeneral, x_rgba);
 }
 
 // vim: set et sw=2 ts=2:

diff --git a/gtk/inspector/general.ui b/gtk/inspector/general.ui
index 2ff6cb85c225ff035237c17268bdcddd80c25ea1..c99115a63127cc5ec960c03fbf1f070994730c72 100644 (file)
--- a/gtk/inspector/general.ui
+++ b/gtk/inspector/general.ui
@@ -9,6 +9,7 @@
         <property name="orientation">vertical</property>
         <property name="margin">60</property>
         <property name="spacing">10</property>
+
         <child>
           <object class="GtkFrame" id="version_frame">
             <property name="visible">True</property>
@@ -89,6 +90,7 @@
             </child>
           </object>
         </child>
+
         <child>
           <object class="GtkFrame" id="env_frame">
             <property name="visible">True</property>
@@ -346,6 +348,123 @@
             </child>
           </object>
         </child>
+
+        <child>
+          <object class="GtkFrame" id="x_frame">
+            <property name="visible">True</property>
+            <property name="halign">center</property>
+            <child>
+              <object class="GtkListBox" id="x_box">
+                <property name="visible">True</property>
+                <property name="selection-mode">none</property>
+                <child>
+                  <object class="GtkListBoxRow">
+                    <property name="visible">True</property>
+                    <property name="activatable">False</property>
+                    <child>
+                      <object class="GtkBox">
+                        <property name="visible">True</property>
+                        <property name="orientation">horizontal</property>
+                        <property name="margin">10</property>
+                        <property name="spacing">40</property>
+                        <child>
+                          <object class="GtkLabel" id="x_display_label">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">X display</property>
+                            <property name="halign">start</property>
+                            <property name="valign">baseline</property>
+                            <property name="xalign">0.0</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="x_display">
+                            <property name="visible">True</property>
+                            <property name="selectable">True</property>
+                            <property name="halign">end</property>
+                            <property name="valign">baseline</property>
+                            <property name="ellipsize">end</property>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkListBoxRow">
+                    <property name="visible">True</property>
+                    <property name="activatable">False</property>
+                    <child>
+                      <object class="GtkBox">
+                        <property name="visible">True</property>
+                        <property name="orientation">horizontal</property>
+                        <property name="margin">10</property>
+                        <property name="spacing">40</property>
+                        <child>
+                          <object class="GtkLabel" id="x_rgba_label">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">RGBA visual</property>
+                            <property name="halign">start</property>
+                            <property name="valign">baseline</property>
+                            <property name="xalign">0.0</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkImage" id="x_rgba">
+                            <property name="halign">end</property>
+                            <property name="valign">baseline</property>
+                            <property name="icon-name">object-select-symbolic</property>
+                            <property name="icon-size">1</property>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkListBoxRow">
+                    <property name="visible">True</property>
+                    <property name="activatable">False</property>
+                    <child>
+                      <object class="GtkBox">
+                        <property name="visible">True</property>
+                        <property name="orientation">horizontal</property>
+                        <property name="margin">10</property>
+                        <property name="spacing">40</property>
+                        <child>
+                          <object class="GtkLabel" id="x_composited_label">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Composited</property>
+                            <property name="halign">start</property>
+                            <property name="valign">baseline</property>
+                            <property name="xalign">0.0</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkImage" id="x_composited">
+                            <property name="halign">end</property>
+                            <property name="valign">baseline</property>
+                            <property name="icon-name">object-select-symbolic</property>
+                            <property name="icon-size">1</property>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+
         <child>
           <object class="GtkFrame" id="gl_frame">
             <property name="visible">True</property>
@@ -445,6 +564,9 @@
       <widget name="gtk_exe_prefix_label"/>
       <widget name="gtk_data_prefix_label"/>
       <widget name="gsettings_schema_dir_label"/>
+      <widget name="x_display_label"/>
+      <widget name="x_rgba_label"/>
+      <widget name="x_composited_label"/>
     </widgets>
   </object>
   <object class="GtkSizeGroup">
@@ -453,6 +575,7 @@
       <widget name="version_frame"/>
       <widget name="gl_frame"/>
       <widget name="env_frame"/>
+      <widget name="x_frame"/>
     </widgets>
   </object>
 </interface>